This is, generally, not a safe way to backport a change. If PR were to get merged to 22.3 with a merge commit, the "Fix merge conflicts" change would make a bunch of unwanted changes when we next merge forward to develop, likely breaking the build.
That is all to say, be extra-super-careful to choose "Squash and merge" when you merge this.

Alternatively, you could run this to clean up the PR and eliminate any possible confusion:

git checkout 22.3_fb_permissions
git reset --hard origin/release22.3-SNAPSHOT
git cherry-pick 68d437d
git push --force

Correction: I didn't realize that this change was coming from the bimberlabkeyinternal fork. My git command might be wrong depending on which remote is "origin" in your enlistment